From 3f486a0feeca4c7b8d5aa4e88145dad66506d612 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Mon, 15 Feb 2021 10:42:41 +0000
Subject: [PATCH] Force installation of fontconfig's preferred fonts for tests

The experimental dependency resolver is non-deterministic and can
choose various different fonts, some of which make the reftests fail.
Force its hand by choosing the fonts that fontconfig prioritizes highest,
so that we get deterministic results.
---
 debian/control       | 2 ++
 debian/control.in    | 2 ++
 debian/tests/control | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 55fd92dbb1..f73d0d3813 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                docbook-xsl,
                dpkg-dev (>= 1.17.14),
                fonts-cantarell <!nocheck>,
+               fonts-dejavu-core <!nocheck>,
                gnome-pkg-tools (>= 0.11),
                gobject-introspection (>= 1.41.3),
                gsettings-desktop-schemas <!nocheck>,
@@ -51,6 +52,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                meson (>= 0.54),
                pkg-config,
                sassc,
+               ttf-bitstream-vera <!nocheck>,
                wayland-protocols (>= 1.20) [linux-any],
                xauth <!nocheck>,
                xsltproc,
diff --git a/debian/control.in b/debian/control.in
index 36647ec779..2c94222810 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,6 +11,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                docbook-xsl,
                dpkg-dev (>= 1.17.14),
                fonts-cantarell <!nocheck>,
+               fonts-dejavu-core <!nocheck>,
                gnome-pkg-tools (>= 0.11),
                gobject-introspection (>= 1.41.3),
                gsettings-desktop-schemas <!nocheck>,
@@ -51,6 +52,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                meson (>= 0.54),
                pkg-config,
                sassc,
+               ttf-bitstream-vera <!nocheck>,
                wayland-protocols (>= 1.20) [linux-any],
                xauth <!nocheck>,
                xsltproc,
diff --git a/debian/tests/control b/debian/tests/control
index bd26ad4472..6427dedc91 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -8,9 +8,9 @@ Depends: dbus, gir1.2-gtk-4.0, python3-gi, xauth, xvfb
 Restrictions: flaky, superficial
 
 Tests: installed-tests
-Depends: dbus (>= 1.8), gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, xauth, xvfb
+Depends: dbus (>= 1.8), fonts-dejavu-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, ttf-bitstream-vera, xauth, xvfb
 Restrictions: allow-stderr
 
 Tests: installed-tests-flaky
-Depends: dbus (>= 1.8), gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, xauth, xvfb
+Depends: dbus (>= 1.8), fonts-dejavu-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, ttf-bitstream-vera, xauth, xvfb
 Restrictions: allow-stderr, flaky
-- 
2.30.2